Issue #26: Cleaned code in dynamic body class