Cleaned up Code
Cleaned code started adding new features