Making physical plural

also some code reformat