Small changes. Made things more concise.