Simplified method calls and combined many methods into one, single call.
Also update if-statment code to be much more readable.