comments & cleaning
added key schedule, better structure for future