Made a few tidy ups in terms of code and usability, final commit for SEP