cleanup code a bit
cleanup