ADD: Override annotations
REM: obsolete else statements
REM: unnecessary casts
ADD: some Override annotations