Cleaned up code based on ASTM standard and improved documentation
Code cleanup, added enw constatnts, and updated documentation