cleanup code solution, add css