hlim10 kchen26 : Small Refactoring + add Battle Activity