Cleaned up documentation, some method names and associated specs