fix class_name parsing
white-space formatting
fix file requiring