Code formatter and clean up