Made entire implementation a bit faster and easier to read as well
Merge branch 'develop'