cleaned up basic setup