cleaned up of formatting