Added User Story references
Cleaned up code