cleanup, correction of spelling mistakes, restructure based on feedback - prototype