Minor cleanup & reformatting