removed extra margin and fixed code style