Streamlined, removed commented out code, removed unnecessary methods
and updated in-code documentation.