Improves structure a little bit