Seems like I messed up with changes for cleaning the code and comments. Fixed