Code clean up

Most improving indenting for extra readibility
Improve CDFRME read speed