cut down some code