Some Code cleanup + comments