Format & clean code