Clean up, comment where applicable