Attempt at formatting clean up