Clean-Up and Finalize

Added quickest, cleaned-up code.