final
Code cleanup

Comments removed