Made some code clean up :)