Code cleanup + optimalization + Animation Duration

Move const from comments to code