Removed unused code; Added missing keywords; Added defaultToken