cleaned up code

eliminated wasted space and unecessary code.
2

2