Preparing code for final submission