Refactored stuff. Fixed all errors/warnings I had on my IDE.