Minor refactoring and name changes to reflect martial spirit