Cleaned up, ready for release I think