Replaced some magic numbers with their enums.
Removed a little unneccessary code.
Clarified a log message.