Code cleanup..