cleaning up
commitng all changes