Cleaning code
Fix Calling getter method * on self is slower than field access *