Overall cleanup & cosmetic refactoring ;)