Cleaned up and finalized