Declaring Variables as late as possible
Putting default behavior
Fixing the Style of some comments