Cleanup and leet code