refactor Makefile for rhui rhua
minor whitespace tunes