formatting and refactoring to pass vip validation

removed attributes functionality. :-(