Code cleanup + comments