[TASK] Added some comments and a naming functionality