Cleaned up Code
More tweaking