[Issue #12] Cleanning comments and animations