Removed un-used code, fix comment formatting