Added documentation/cleanliness