Random updates
Merge pull request #2 from ahinz/topic/refactor

Random updates