Removed extension.
Code clean up and documentation update.