Refactored methods + Removed redundant comments

TODO:
> Testing
> Implement Block/Unblock/Search