Code cleanup to tictak demo