Fixed overwritten java methods
Fixed some conventions