Corrections made

Corrections made for better organization and functionality