#17: Code cleanup