Add comments and make smaller some commands