Fixed some tab/spacing issues