refactoring + todo
refactoring
code simplification
specify comment
Merge branch 'timing' of github.com:aJanker/TypeChef into andreastiming