Renamed base to mono and cleaned up some re-used code