Just some minor clean up in the inialization process. Sorry for the line trimming...