Small Changes

Shortened up some code
merged