Code Cleanup and derps
More Code Cleanup and derps (im not thinking straight)