Added comments, small cleaning up