minor fixes & cleanup & consistent naming