Some simple code refomatting