Formatting

+ removing unecessary reflection class