3rd commit, cleaner style