Clean-up + minor changes