Removed unnecessary components; style fixes