Removed inline control structures to comply with PSR2