Slight refactor of last commit

#119