Clean Up code & making it ready for future updates