alignment cleanup and required fields