Cleaned up code

Still need to add descriptions