Cleaned Up Code Quality