Took out unnecessary reflection and reduced file size