Date Improvement

Moved some code around and rewrote comments to Go standards.