Code cleanup :D