Removed unnecessary code and comments, and it should be as up to date as possible now.