[TASK] Code cleanup

Some small improvements I'd like to propose.