Refactored part of definitions

* Fixed errors in nucleon spinor and added intermediate simplification of expressions