some housekeeping and fixing some style issues