Attempt at cleaning up