Optimize by increasing compile time information

Basically I replaced `block()` calls to whatever is more appropriate
Avoid unnecessary initializing