Cleaned up Script a little bit...