Cleaned up somethings.