Minor usability, code cleanup