#28 | Fixing issues from code review
#28 | updating specs for readability