likeRefactor: moved and made code more concise. No logic changes
Merge pull request #69 from NJLucyk/likeRefactor

likeRefactor: moved and made code more concise. No logic changes