Fix code smells
Add rake dependency
Fix tags hash