Refactored to separate CPU and memory metrics for better lack of cohesion
Fix codestyling issues
Merge pull request #28 from dennisdegreef/refactorFunctionCall

Refactored to separate CPU and memory metrics for better lack of cohesion