Cleaned up

Cleaned up, removed unneeded calculations