comments and cleaned up