Moved initialization until later. Also moved around code a bit to be
consistant.

9 files changed