Updated JavaDoc, refactored Samples class