got rid of more redundant code or access calls.