Properly receiving entity requests
Minor code style update (Part IV)