Initial refactor

Remove unnecassary code, Renames, Comments