Cleanup, easier reading