Changed all fields to package private
Clarified filter implementations
Commented building layout