Format Code and clean up