Some cosmetic changes and removal of redundant code
Some cosmetic changes and removal of redundant code

Nubisproject/nubis-puppet-eip,limed/nubis-puppet-eip,gozer/nubis-puppet-eip,gozer/nubis-puppet-eip,limed/nubis-puppet-eip,Nubisproject/nubis-puppet-eip