Initial refactoring
Fix #1 by skipping incomplete entries, convert regexes to constants