code cleanup :D