Cleaned the code a bit more.