Added comments
Code cleanup