Checked off todo. removed whitespace