Refactoring and cleanup structural Angular things