Organized code and made quality of life improvements