Tweaked startup
Code standards