Changes sample to be more realistic and relevant to developers; Code cleanup