Code cleanup + opt