Cleaned up PAV component constructors and setup