Sprint6 - Leftover cleanup, refactoring