Made % stats non-decimal form
General cleanup
General maintenance, refactoring