Change class places, style fixes, change method, call to public send, change variables name, beautify