Code refactoring and white space cleaning
More code refactoring
Fix #43: next() and previous() can now shift by multiple domains