Simple fixes & Code cleanup
Code cleanup