Removed fairware and improved inline docs