Removed CSS inline and todo