style cleanup & fixed links