Clean up style
Fix bug where list wasn't getting extended