Cleaned up code (forgot to git add after changes were made)