@T19:R, Code cleanup, updated to respect code conventions.