Fixes #10, resolves #11 and solves readability issue