Some code cleanup & Code commens