Cleaned up helpers and documentation