Improved CodecLokkupService

- Minor improvements to multiple classes

Signed-off-by: thehutch <th3hutch@yahoo.co.uk>