Cleaned up code
Removed sout
Added simple expression calculator