Refactor, code cleanup

primes is now calculation
organize imports
remove unused comments