Initial refactoring commint
Fix Heart Rate timestamp
Merge pull request #2 from Andersos/refactor

Refactor