Slight Improvements on omi's request

Signed-off-by: ShadowChild <shadychild12@gmail.com>