Cleans up code; no functional changes