Best Practice Overhaul Start

Started altering code to better adhere to best practice.