Revert "cleanup indentation"

This reverts commit 5604ae700fb80da22593625d2a499a541c20b302.
add test framework and cleanup