Revert "Improved counting, move commented appended"

This reverts commit 7148e1a8005e67bec6a063842ec9c39ea35072a8.