linked dependencies
minor code formatting tweaks
code cleanup