Cleanup and add yMax binding