Refractoring Bugfixes
#Refractor Completed!