Cleaning up

Shrinking names and cleaning the code for next PR