remove padding
remove weird indentation
remove reliance on id