fix naming convention
fix documentation strings
fix exit except