Code clean-up, first test, method renaming, etc.