Finalized and checked indentations and removed test scripts