[-] Removed a testing-only line or two of code
[@] Converted some methods into properties