Cleaned up initial release