Code cleanup & Stuff