code cleanup (removed redundant, ...)
fixed fc on rotation