[TASK] Cleanups and switch to inline syntax