Updated tab spaces and function declaratiions