Fixed and cleaned up formatting