a little code clean up on props and levels