removed commented debug code
fallback to url
refactor
alignment
alignment
braces