cleaning up

underscores for all

removing extra space