cleanup

cleaning up code a bit