slightly cleaner and fixed soring