YAGNI. Cleanup and identation