Feature/make check

JIRA REF: https://cartodb.atlassian.net/browse/CDB-592