Simpler code style