* cleaned up code.