General Adjustments

Commenting of functions and methods, tabbing correctly and removing
excess spaces