Fixed some function return types
Fixed some arrays not properly detected
Some refactoring
Removed original class styles where they are not relevant