Implemented Save

Follow guideline of single lined if blocks.