Clean up + comments