Did some refactoring,got rid of pesky egyptian braces