#29 Refactoring Forum Code