Restructured Classes to have a stand-alone constructor at the top, and the class-level functionality at the bottom