Reorganise class for better readability, less variables
Merge pull request #2 from lloydmeta/refactor/lower_method_complexithy

Reorganise class for better readability, less variables