Few additions for debug and cleanup
Working formmatting script
Formatted sources