Minor CS fixes and @throws docblock clause added.