Created account class
Got rid of unnecessary variables

I'm not using them more than once so there ya go