couple code structure ammendments