Edited nomencalture

Removed redundant parts, added most of the other bits