Comments and Code clean up