Cleaned method definitions

This builds, and simplifies integers just fine!