Cleaned up comments and whitespace. Added filters.