Modularize angle retrival