TW-14: General code review