Removing Warning
Restructured Code and Clean Up work