removes unused code
uses the shorthand version
code makeup
moves outside the bootstrapping code