added convenience functions and cleaned up names