Nice comments and variables moved directly to components