cleaned up formatting and stuff