Commited some cleanup changes