Cleaned whitespace, comments, refactored our item id

Signed-off-by: Cory Leistikow <cory.leistikow@gmail.com>