Remove outdated debugging and notes, reorganize parameters