Reorganize for easier modification, correct method spelling