Code Refactor!

Fixing up code so it fits the standard and common sense.
Code Refactor! Cleaned up code so it fits the standard and common sense