Code Tidy (fixed)