Slight refactor of method organization
Removes unnecessary functions, progress with calculations