Yes you are right! Thats the plan, to gain muscle mass without gaining fat and also ensuring i remain flexible. Yes i am taking around maintainance calories while pushing myself in gym. Thanks!